#include "base/util.h"
#include "extensions/util.h"
-static inline long
+static inline void
conv_rgbu16_rgbau16 (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*dst16++ = *src16++;
*dst16++ = 0xffff;
}
-
- return samples;
}
-static inline long
+static inline void
conv_yu16_yau16 (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*dst16++ = *src16++;
*dst16++ = 0xffff;
}
-
- return samples;
}
int init (void);
*to_Z = zr * D50_WHITE_REF_Z;
}
-static long
+static void
rgba_to_lab (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 3;
}
- return n;
}
-static long
+static void
lab_to_rgba (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 3;
dst += sizeof (double) * 4;
}
- return n;
}
-static long
+static void
rgba_to_laba (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 4;
}
- return n;
}
-static long
+static void
laba_to_rgba (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 4;
}
- return n;
}
static inline void
*to_H += 360;
}
-static long
+static void
rgba_to_lchab (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 3;
}
- return n;
}
-static long
+static void
lchab_to_rgba (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 3;
dst += sizeof (double) * 4;
}
- return n;
}
-static long
+static void
rgba_to_lchaba (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 4;
}
- return n;
}
-static long
+static void
lchaba_to_rgba (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 4;
}
- return n;
}
return f * f * f;
}
-static long
+static void
Yaf_to_Laf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 2;
dst += 2;
}
-
- return samples;
}
-static long
+static void
rgbf_to_Labf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 3;
dst += 3;
}
-
- return samples;
}
-static long
+static void
rgbaf_to_Labaf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 4;
dst += 4;
}
-
- return samples;
}
-static long
+static void
Labf_to_rgbf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 3;
dst += 3;
}
-
- return samples;
}
-static long
+static void
Labaf_to_rgbaf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 4;
dst += 4;
}
-
- return samples;
}
-static long
+static void
Labf_to_Lchabf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 3;
dst += 3;
}
-
- return samples;
}
-static long
+static void
Lchabf_to_Labf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 3;
dst += 3;
}
-
- return samples;
}
-static long
+static void
Labaf_to_Lchabaf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 4;
dst += 4;
}
-
- return samples;
}
-static long
+static void
Lchabaf_to_Labaf (const Babl *conversion,float *src,
float *dst,
long samples)
src += 4;
dst += 4;
}
-
- return samples;
}
static void
/******** begin integer RGB/CIE color space conversions **************/
-static inline long
+static inline void
convert_double_u8_scaled (const Babl *conversion,
double min_val,
double max_val,
src += src_pitch;
dst += dst_pitch;
}
- return n;
}
-static inline long
+static inline void
convert_u8_double_scaled (const Babl *conversion,
double min_val,
double max_val,
dst += dst_pitch;
src += src_pitch;
}
- return n;
}
#define MAKE_CONVERSIONS(name, min_val, max_val, min, max) \
- static long \
+ static void \
convert_ ## name ## _double (const Babl *c, char *src, \
char *dst, \
int src_pitch, \
int dst_pitch, \
long n) \
{ \
- return convert_u8_double_scaled (c, min_val, max_val, min, max, \
- src, dst, src_pitch, dst_pitch, n); \
+ convert_u8_double_scaled (c, min_val, max_val, min, max, \
+ src, dst, src_pitch, dst_pitch, n); \
} \
- static long \
+ static void \
convert_double_ ## name (const Babl *c, char *src, \
char *dst, \
int src_pitch, \
int dst_pitch, \
long n) \
{ \
- return convert_double_u8_scaled (c, min_val, max_val, min, max, \
- src, dst, src_pitch, dst_pitch, n); \
+ convert_double_u8_scaled (c, min_val, max_val, min, max, \
+ src, dst, src_pitch, dst_pitch, n); \
}
/* source ICC.1:2004-10 */
);
}
-static inline long
+static inline void
convert_double_u16_scaled (const Babl *conversion,
double min_val,
double max_val,
dst += dst_pitch;
src += src_pitch;
}
- return n;
}
-static inline long
+static inline void
convert_u16_double_scaled (const Babl *conversion,
double min_val,
double max_val,
dst += dst_pitch;
src += src_pitch;
}
- return n;
}
#define MAKE_CONVERSIONS(name, min_val, max_val, min, max) \
- static long \
+ static void \
convert_ ## name ## _double (const Babl *c, char *src, \
char *dst, \
int src_pitch, \
int dst_pitch, \
long n) \
{ \
- return convert_u16_double_scaled (c, min_val, max_val, min, max, \
- src, dst, src_pitch, dst_pitch, n); \
+ convert_u16_double_scaled (c, min_val, max_val, min, max, \
+ src, dst, src_pitch, dst_pitch, n); \
} \
- static long \
+ static void \
convert_double_ ## name (const Babl *c, char *src, \
char *dst, \
int src_pitch, \
int dst_pitch, \
long n) \
{ \
- return convert_double_u16_scaled (c, min_val, max_val, min, max, \
- src, dst, src_pitch, dst_pitch, n); \
+ convert_double_u16_scaled (c, min_val, max_val, min, max, \
+ src, dst, src_pitch, dst_pitch, n); \
}
MAKE_CONVERSIONS (u16_l, 0.0, 100.0, 0x00, 0xffff)
#define RGB_LUMA_BLUE 0.114 //0.0722
#define EPSILON 1e-10
-static long rgba_to_hcya (const Babl *conversion,char *src,
+static void rgba_to_hcya (const Babl *conversion,char *src,
char *dst,
long samples);
-static long hcya_to_rgba (const Babl *conversion,char *src,
+static void hcya_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples);
-static long rgba_to_hcy (const Babl *conversion,char *src,
+static void rgba_to_hcy (const Babl *conversion,char *src,
char *dst,
long samples);
-static long hcy_to_rgba (const Babl *conversion,char *src,
+static void hcy_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples);
((double *) dst)[2] = gamma_2_2_to_linear (blue);
}
-static long
+static void
rgba_to_hcya (const Babl *conversion,char *src,
char *dst,
long samples)
return samples;
}
-static long
+static void
hcya_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples)
return samples;
}
-static long
+static void
rgba_to_hcy (const Babl *conversion,char *src,
char *dst,
long samples)
return samples;
}
-static long
+static void
hcy_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples)
#define MAX(a,b) ((a < b) ? b : a)
#define EPSILON 1.0e-10
-static long rgba_to_hsla (const Babl *conversion,char *src,
+static void rgba_to_hsla (const Babl *conversion,char *src,
char *dst,
long samples);
-static long hsla_to_rgba (const Babl *conversion,char *src,
+static void hsla_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples);
-static long rgba_to_hsl (const Babl *conversion,char *src,
+static void rgba_to_hsl (const Babl *conversion,char *src,
char *dst,
long samples);
-static long hsl_to_rgba (const Babl *conversion,char *src,
+static void hsl_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples);
static void rgb_to_hsl_step (double *src,
}
-static long
+static void
rgba_to_hsla (const Babl *conversion,char *src,
char *dst,
long samples)
src += 4 * sizeof (double);
dst += 4 * sizeof (double);
}
-
- return samples;
}
-static long
+static void
rgba_to_hsl (const Babl *conversion,char *src,
char *dst,
long samples)
src += 4 * sizeof (double);
dst += 3 * sizeof (double);
}
-
- return samples;
}
}
-static long
+static void
hsla_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples)
src += 4 * sizeof (double);
dst += 4 * sizeof (double);
}
-
- return samples;
}
-static long
+static void
hsl_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples)
src += 3 * sizeof (double);
dst += 4 * sizeof (double);
}
-
- return samples;
}
#define MAX(a,b) (a < b) ? b : a;
#define EPSILON 1.0e-10
-static long rgba_to_hsva (const Babl *conversion,char *src,
+static void rgba_to_hsva (const Babl *conversion,char *src,
char *dst,
long samples);
-static long hsva_to_rgba (const Babl *conversion,char *src,
+static void hsva_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples);
-static long rgba_to_hsv (const Babl *conversion,char *src,
+static void rgba_to_hsv (const Babl *conversion,char *src,
char *dst,
long samples);
-static long hsv_to_rgba (const Babl *conversion,char *src,
+static void hsv_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples);
((double *) dst)[2] = gamma_2_2_to_linear (blue);
}
-static long
+static void
rgba_to_hsva (const Babl *conversion,char *src,
char *dst,
long samples)
return samples;
}
-static long
+static void
hsva_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples)
return samples;
}
-static long
+static void
rgba_to_hsv (const Babl *conversion,char *src,
char *dst,
long samples)
return samples;
}
-static long
+static void
hsv_to_rgba (const Babl *conversion,char *src,
char *dst,
long samples)
int init (void);
-static inline long
+static inline void
conv_rgba8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
uint32_t blue = red_blue >> 16;
*dsti++ = green_alpha | red | blue | 0xff000000;
}
- return samples;
}
-static inline long
+static inline void
conv_rgb8_cairo24_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*dst++ = red;
*dst++ = 255;
}
- return samples;
}
#if 0
-static inline long
+static inline void
conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*dst++ = red;
*dst++ = alpha;
}
- return samples;
}
#else
-static inline long
+static inline void
conv_rgbA8_premul_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
uint32_t blue = red_blue >> 16;
*dsti++ = green_alpha | red | blue;
}
- return samples;
}
#endif
-static long conv_cairo32_rgbA8_premul_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
+static void conv_cairo32_rgbA8_premul_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
while (n--)
*dst++ = blue;
*dst++ = alpha;
}
- return samples;
}
-static long conv_cairo32_rgbAF_premul_le (const Babl *conversion,unsigned char *src, unsigned char *dst_char, long samples)
+static void conv_cairo32_rgbAF_premul_le (const Babl *conversion,unsigned char *src, unsigned char *dst_char, long samples)
{
long n = samples;
float *dst = (void*)dst_char;
*dst++ = blue / 255.0;
*dst++ = alpha / 255.0;
}
- return samples;
}
-static inline long
+static inline void
conv_rgbA8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*dst++ = div_255 (red * alpha);
*dst++ = alpha;
}
- return samples;
}
-static inline long
+static inline void
conv_rgb8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*dst++ = red;
*dst++ = 0xff;
}
- return samples;
}
-static inline long
+static inline void
conv_yA8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*dst++ = val;
*dst++ = alpha;
}
- return samples;
}
-static inline long
+static inline void
conv_yA16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*dst++ = (alpha * 0xff + 0.5f);
ssrc+=2;
}
- return samples;
}
-static inline long
+static inline void
conv_y8_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*dst++ = val;
*dst++ = 0xff;
}
- return samples;
}
-static inline long
+static inline void
conv_y16_cairo32_le (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*dst++ = val;
*dst++ = 0xff;
}
- return samples;
}
-static long
+static void
conv_rgbA_gamma_float_cairo32_le (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*cdst++ = val >= 0xff ? 0xff : val <= 0 ? 0 : val;
fsrc+=4;
}
- return samples;
}
-static long
+static void
conv_rgbafloat_cairo32_le (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*cdst++ = balpha + 0.5f;
}
}
- return samples;
}
-static long
+static void
conv_yafloat_cairo32_le (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*cdst++ = balpha + 0.5f;
}
}
- return samples;
}
int
}
#endif
-static INLINE long
+static INLINE void
conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = alpha;
}
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbaF_linear_rgba8_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*cdst++ = val >= 0xff ? 0xff : val <= 0 ? 0 : val;
}
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbaF_linear_rgbA8_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*cdst++ = balpha + 0.5f;
}
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_yaF_linear_rgbA8_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*cdst++ = balpha + 0.5f;
}
}
- return samples;
}
-static long
+static void
conv_rgbaF_linear_rgbA8_gamma_cairo (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*cdst++ = balpha + 0.5f;
}
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbAF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = alpha;
}
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbaF_linear_rgbaF_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = linear_to_gamma_2_2_lut (*fsrc++);
*fdst++ = *fsrc++;
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbF_linear_rgbF_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = linear_to_gamma_2_2_lut (*fsrc++);
*fdst++ = linear_to_gamma_2_2_lut (*fsrc++);
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbaF_gamma_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = gamma_2_2_to_linear_lut (*fsrc++);
*fdst++ = *fsrc++;
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbF_gamma_rgbF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = gamma_2_2_to_linear_lut (*fsrc++);
*fdst++ = gamma_2_2_to_linear_lut (*fsrc++);
}
- return samples;
}
#define o(src, dst) \
dst[i] = float_to_half_float (src[i]);
}
-static inline long
+static inline void
conv_yHalf_yF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
halfp2singles(dst, src, samples);
- return samples;
}
-static long
+static void
conv_yaHalf_yaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
- return conv_yHalf_yF (conversion, src, dst, samples * 2) / 2;
+ conv_yHalf_yF (conversion, src, dst, samples * 2);
}
-static long
+static void
conv_rgbHalf_rgbF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
- return conv_yHalf_yF (conversion, src, dst, samples * 3) / 3;
+ conv_yHalf_yF (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_rgbaHalf_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
- return conv_yHalf_yF (conversion, src, dst, samples * 4) / 4;
+ conv_yHalf_yF (conversion, src, dst, samples * 4);
}
-static inline long
+static inline void
conv_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
singles2halfp (dst, src, samples);
- return samples;
}
-static long
+static void
conv_yaF_yaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv_yF_yHalf (conversion, src, dst, samples * 2) / 2;
+ conv_yF_yHalf (conversion, src, dst, samples * 2);
}
-static long
+static void
conv_rgbF_rgbHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv_yF_yHalf (conversion, src, dst, samples * 3) / 3;
+ conv_yF_yHalf (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_rgbaF_rgbaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv_yF_yHalf (conversion, src, dst, samples * 4) / 4;
+ conv_yF_yHalf (conversion, src, dst, samples * 4);
}
static void singles2halfp2(void *target, const void *source, long numel)
}
}
-static inline long
+static inline void
conv2_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
singles2halfp2 (dst, src, samples);
- return samples;
}
-static long
+static void
conv2_yaF_yaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv2_yF_yHalf (conversion, src, dst, samples * 2) / 2;
+ conv2_yF_yHalf (conversion, src, dst, samples * 2);
}
-static long
+static void
conv2_rgbF_rgbHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv2_yF_yHalf (conversion, src, dst, samples * 3) / 3;
+ conv2_yF_yHalf (conversion, src, dst, samples * 3);
}
-static long
+static void
conv2_rgbaF_rgbaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv2_yF_yHalf (conversion, src, dst, samples * 4) / 4;
+ conv2_yF_yHalf (conversion, src, dst, samples * 4);
}
int init (void);
#define INLINE inline
-static INLINE long
+static INLINE void
conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = babl_trc_from_linear (trc[2], *fsrc++) * alpha;
*fdst++ = *fsrc++;
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbAF_linear_rgbAF_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = *fsrc++;
}
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbaF_linear_rgbaF_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = babl_trc_from_linear (trc[2], *fsrc++);
*fdst++ = *fsrc++;
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbF_linear_rgbF_gamma (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = babl_trc_from_linear (trc[1], *fsrc++);
*fdst++ = babl_trc_from_linear (trc[2], *fsrc++);
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbaF_gamma_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = babl_trc_to_linear (trc[2], *fsrc++);
*fdst++ = *fsrc++;
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbF_gamma_rgbF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*fdst++ = babl_trc_to_linear (trc[1], *fsrc++);
*fdst++ = babl_trc_to_linear (trc[2], *fsrc++);
}
- return samples;
}
#define o(src, dst) \
return (u.s >> 15) & ((1 << 17)-1);
}
-static INLINE long
+static INLINE void
conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 1;
src += 4;
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_F_8g (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 1;
src += 4;
}
- return samples;
}
-static INLINE long __attribute__((unused))
+static INLINE void __attribute__((unused))
conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 1;
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
}
- return samples;
}
-static INLINE long __attribute__((unused))
+static INLINE void __attribute__((unused))
conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
dst += 1;
}
- return samples;
}
#define conv_rgbaF_rgbP8 conv_rgbaF_rgba8
-static INLINE long __attribute__((unused))
+static INLINE void __attribute__((unused))
conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8g (conversion, src, dst, samples * 3);
- return samples;
}
-static INLINE long __attribute__((unused))
+static INLINE void __attribute__((unused))
conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbA8 conv_rgbaF_rgba8
#define conv_gAF_gA8 conv_gaF_ga8
-static INLINE long
+static INLINE void
conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 1;
}
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgb8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
(*(float *) dst) = 1.0;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_rgbAF_rgb8 (const Babl *conversion,unsigned char *srcc,
unsigned char *dstc,
long samples)
src += 4;
dst += 3;
}
- return samples;
}
-static long
+static void
conv_bgrA8_rgba8 (const Babl *conversion,unsigned char *srcc,
unsigned char *dstc,
long samples)
src += 4;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_rgbaF_rgbAF (const Babl *conversion,unsigned char *srcc,
unsigned char *dstc,
long samples)
src += 4;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_rgbAF_rgbaF (const Babl *conversion,unsigned char *srcc,
unsigned char *dstc,
long samples)
src += 4;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_rgbAF_lrgba8 (const Babl *conversion,unsigned char *srcc,
unsigned char *dstc,
long samples)
src += 4;
dst += 4;
}
- return samples;
}
#define conv_rgb8_rgbAF conv_rgb8_rgbaF
*
*/
-static long
+static void
conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 1;
src += 4;
}
- return samples;
}
-static long
+static void
conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 2;
src += 4;
}
- return samples;
}
-static long
+static void
conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 1;
}
- return samples;
}
-static long
+static void
conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 2;
}
- return samples;
}
-static long
+static void
conv_F_D (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 8;
src += 4;
}
- return samples;
}
-static long
+static void
conv_D_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 8;
}
- return samples;
}
-static long
+static void
conv_16_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 1;
src += 2;
}
- return samples;
}
-static long
+static void
conv_8_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 2;
src += 1;
}
- return samples;
}
/*********/
-static long
+static void
conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 4);
- return samples;
}
#define conv_rgbaF_rgbP8 conv_rgbaF_rgba8
-static long
+static void
conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbA8 conv_rgbaF_rgba8
#define conv_gF_g8 conv_F_8
#define conv_gAF_gA8 conv_gaF_ga8
-static long
+static void
conv_rgbaF_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbaF_rgbaD (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_D (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbaD_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_D_F (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbAD conv_rgbaF_rgbaD
#define conv_gF_g16 conv_F_16
#define conv_gAF_gA16 conv_gaF_ga16
-static long
+static void
conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_F (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb8_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_F (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_F (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA8_rgbAF conv_rgba8_rgbaF
#define conv_gA8_gAF conv_ga8_gaF
#define conv_g8_gF conv_8_F
-static long
+static void
conv_rgba16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb16_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA16_rgbAF conv_rgba16_rgbaF
#define conv_gA16_gAF conv_ga16_gaF
#define conv_g16_gF conv_16_F
-static long
+static void
conv_rgba16_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_8 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb16_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_8 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga16_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_8 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA16_rgbA8 conv_rgba16_rgba8
#define conv_gA16_gA8 conv_ga16_ga8
#define conv_g16_g8 conv_16_8
-static long
+static void
conv_rgba8_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_16 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb8_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_16 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga8_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_16 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA8_rgbA16 conv_rgba8_rgba16
/* alpha conversions */
-static long
+static void
conv_gaF_gAF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
-static long
+static void
conv_gAF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
/* alpha stripping and adding */
-static long
+static void
conv_rgbaF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
src += 4;
}
- return samples;
}
-static long
+static void
conv_gF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
#define conv_gF_rgbAF conv_gF_rgbaF
-static long
+static void
conv_rgbF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*(float *) dst = 1.0;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_gaF_gF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
src += 4;
}
- return samples;
}
-static long
+static void
conv_gF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*(float *) dst = 1.0;
dst += 4;
}
- return samples;
}
#define conv_gF_gAF conv_gF_gaF
/* colorchannel dropping and adding */
-static long
+static void
conv_gF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
-static long
+static void
conv_gaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
#define conv_gAF_rgbAF conv_gaF_rgbaF
/* other conversions coded for some optimisation reason or sumthin */
-static long
+static void
conv_rgbaF_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst++;
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgbaF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgba8_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgbA8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgb8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
}
- return samples;
}
#define conv_rgb8_rgbA8 conv_rgb8_rgba8
-static long
+static void
conv_rgba8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
dst += 3;
}
- return samples;
}
int init (void);
}
-static long
+static void
conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 1;
src += 4;
}
- return samples;
}
-static long
+static void
conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 2;
src += 4;
}
- return samples;
}
-static long
+static void
conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 1;
}
- return samples;
}
-static long
+static void
conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 2;
}
- return samples;
}
/*********/
-static long
+static void
conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 4);
- return samples;
}
#define conv_rgbaF_rgbP8 conv_rgbaF_rgba8
-static long
+static void
conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbA8 conv_rgbaF_rgba8
#define conv_gF_g8 conv_F_8
#define conv_gAF_gA8 conv_gaF_ga8
-static long
+static void
conv_rgbaF_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbA16 conv_rgbaF_rgba16
#define conv_gF_g16 conv_F_16
#define conv_gAF_gA16 conv_gaF_ga16
-static long
+static void
conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_F (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb8_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_F (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_F (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA8_rgbAF conv_rgba8_rgbaF
#define conv_gA8_gAF conv_ga8_gaF
#define conv_g8_gF conv_8_F
-static long
+static void
conv_rgba16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb16_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA16_rgbAF conv_rgba16_rgbaF
return u.s[1];
}
-static long
+static void
conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 1;
src += 4;
}
- return samples;
}
-static long
+static void
conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 2;
src += 4;
}
- return samples;
}
-static long
+static void
conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 1;
}
- return samples;
}
-static long
+static void
conv_rgb8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
(*(float *) dst) = 1.0;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 2;
}
- return samples;
}
-static long
+static void
conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
}
- return samples;
}
/*********/
-static long
+static void
conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbA8 conv_rgbaF_rgba8
#define conv_gF_g8 conv_F_8
#define conv_gAF_gA8 conv_gaF_ga8
-static long
+static void
conv_rgbaF_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbA16 conv_rgbaF_rgba16
#define conv_gF_g16 conv_F_16
#define conv_gAF_gA16 conv_gaF_ga16
-static long
+static void
conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
- return conv_8_F (conversion, src, dst, samples * 4) / 4;
+ conv_8_F (conversion, src, dst, samples * 4);
}
-static long
+static void
conv_rgb8_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
- return conv_8_F (conversion, src, dst, samples * 3) / 3;
+ conv_8_F (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
- return conv_8_F (conversion, src, dst, samples * 2) / 2;
+ conv_8_F (conversion, src, dst, samples * 2);
}
#define conv_rgbA8_rgbAF conv_rgba8_rgbaF
#define conv_gA8_gAF conv_ga8_gaF
#define conv_g8_gF conv_8_F
-static long
+static void
conv_rgba16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb16_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA16_rgbAF conv_rgba16_rgbaF
* gamma correction (not really,. gamma correction belongs in seperate ops,.
*/
-static long
+static void
conv_F_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 1;
src += 4;
}
- return samples;
}
-static long
+static void
conv_F_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 2;
src += 4;
}
- return samples;
}
-static long
+static void
conv_8_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 1;
}
- return samples;
}
-static long
+static void
conv_16_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 2;
}
- return samples;
}
-static long
+static void
conv_rgbaF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
-static long
+static void
conv_F_D (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 8;
src += 4;
}
- return samples;
}
-static long
+static void
conv_D_F (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 8;
}
- return samples;
}
-static long
+static void
conv_16_8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 1;
src += 2;
}
- return samples;
}
-static long
+static void
conv_8_16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 2;
src += 1;
}
- return samples;
}
/*********/
-static long
+static void
conv_rgbaF_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbF_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_gaF_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_8 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbA8 conv_rgbaF_rgba8
#define conv_gF_g8 conv_F_8
#define conv_gAF_gA8 conv_gaF_ga8
-static long
+static void
conv_rgbaF_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_gaF_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_16 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbAF_rgbA16 conv_rgbaF_rgba16
#define conv_gF_g16 conv_F_16
#define conv_gAF_gA16 conv_gaF_ga16
-static long
+static void
conv_rgba8_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
- return conv_8_F (conversion, src, dst, samples * 4) / 4;
+ conv_8_F (conversion, src, dst, samples * 4);
}
-static long
+static void
conv_rgb8_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
- return conv_8_F (conversion, src, dst, samples * 3) / 3;
+ conv_8_F (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_ga8_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
- return conv_8_F (conversion, src, dst, samples * 2) / 2;
+ conv_8_F (conversion, src, dst, samples * 2);
}
#define conv_rgbA8_rgbAF conv_rgba8_rgbaF
#define conv_gA8_gAF conv_ga8_gaF
#define conv_g8_gF conv_8_F
-static long
+static void
conv_rgbaF_rgbaD (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_F_D (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgbaD_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_D_F (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgba16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb16_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga16_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_F (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA16_rgbAF conv_rgba16_rgbaF
#define conv_gA16_gAF conv_ga16_gaF
#define conv_g16_gF conv_16_F
-static long
+static void
conv_rgba16_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_8 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb16_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_8 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga16_ga8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_16_8 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA16_rgbA8 conv_rgba16_rgba8
#define conv_gA16_gA8 conv_ga16_ga8
#define conv_g16_g8 conv_16_8
-static long
+static void
conv_rgba8_rgba16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_16 (conversion, src, dst, samples * 4);
- return samples;
}
-static long
+static void
conv_rgb8_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_16 (conversion, src, dst, samples * 3);
- return samples;
}
-static long
+static void
conv_ga8_ga16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
conv_8_16 (conversion, src, dst, samples * 2);
- return samples;
}
#define conv_rgbA8_rgbA16 conv_rgba8_rgba16
/* alpha conversions */
-static long
+static void
conv_gaF_gAF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
-static long
+static void
conv_gAF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
/* alpha stripping and adding */
-static long
+static void
conv_rgbaF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgbF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*(float *) dst = 1.0;
dst += 4;
}
- return samples;
}
#define conv_rgbF_rgbAF conv_rgbF_rgbaF
-static long
+static void
conv_gaF_gF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
src += 4;
}
- return samples;
}
-static long
+static void
conv_gF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
*(float *) dst = 1.0;
dst += 4;
}
- return samples;
}
#define conv_gF_gAF conv_gF_gaF
/* colorchannel dropping and adding */
-static long
+static void
conv_gF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
-static long
+static void
conv_gaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
#define conv_gAF_rgbAF conv_gaF_rgbaF
/* other conversions coded for some optimisation reason or sumthin */
-static long
+static void
conv_rgbaF_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst++;
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgbaF_rgb16 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgbA16_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 2;
}
- return samples;
}
-static long
+static void
conv_gF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
#define conv_gF_rgbAF conv_gF_rgbaF
/*
- static long
+ static void
conv_rgb8_rgbaF (unsigned char *src,
unsigned char *dst,
int samples)
(*(float *) dst) = 1.0;
dst += 4;
}
- return samples;
}
- static long
+ static void
conv_g8_rgbaF (unsigned char *src,
unsigned char *dst,
int samples)
(*(float *) dst) = 1.0;
dst += 4;
}
- return samples;
}
- static long
+ static void
conv_rgb16_rgbaF (unsigned char *src,
unsigned char *dst,
int samples)
src += 2;
dst += 4;
}
- return samples;
}
- static long
+ static void
conv_gF_rgbaF (unsigned char *src,
unsigned char *dst,
int samples)
src += 4;
}
- return samples;
}
*/
-static long
+static void
conv_rgba8_rgbA8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
dst += 4;
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgbA8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
-static long
+static void
conv_rgb8_rgba8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples-1;
dst[1] = src[1];
dst[2] = src[2];
dst[3] = 255;
- return samples;
}
#define conv_rgb8_rgbA8 conv_rgb8_rgba8
-static long
+static void
conv_rgba8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
src += 4;
dst += 3;
}
- return samples;
}
-static long
+static void
conv_rgbA8_rgb8 (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
long n = samples;
}
src += 4;
}
- return samples;
}
#ifndef byteclamp
- static long
+ static void
conv_yuvaF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
float *src_f = (float *) src;
dst_f += 4;
src_f += 4;
}
- return samples;
}
-static long
+static void
conv_yuvF_rgbF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
{
float *src_f = (float *) src;
dst_f += 3;
src_f += 3;
}
- return samples;
}
int init (void);
return j;
}
-static INLINE long
+static INLINE void
u8_linear_to_float_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
while (n--)
*d++ = lut_linear[*src++];
-
- return samples;
}
-static INLINE long
+static INLINE void
u8_linear_to_float_linear_premul (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
src += 4;
d += 4;
}
- return samples;
}
-static INLINE long
+static INLINE void
u8_gamma_2_2_to_float_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
while (n--)
*d++ = lut_gamma_2_2[space_no][*src++];
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgba8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
{
u8_linear_to_float_linear (conversion, src, dst, samples * 4);
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgba8_linear_ragabaaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
{
u8_linear_to_float_linear_premul (conversion, src, dst, samples);
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgba8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = lut_gamma_2_2[space_no][*src++];
*d++ = lut_linear[*src++];
}
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgb8_linear_rgbF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
{
u8_linear_to_float_linear (conversion, src, dst, samples * 3);
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgb8_gamma_2_2_rgbF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
{
u8_gamma_2_2_to_float_linear (conversion, src, dst, samples * 3);
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_rgb8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = lut_linear[*src++];
*d++ = 1.0;
}
-
- return samples;
}
#define conv_rgb8_linear_ragabaaF_linear conv_rgb8_linear_rgbaF_linear
-static INLINE long
+static INLINE void
conv_rgb8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = lut_gamma_2_2[space_no][*src++];
*d++ = 1.0;
}
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_ga8_linear_gaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
{
u8_linear_to_float_linear (conversion, src, dst, samples * 2);
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_ga8_gamma_2_2_gaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = lut_gamma_2_2[space_no][*src++];
*d++ = lut_linear[*src++];
}
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_ga8_gamma_2_2_rgba8_gamma_2_2 (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*dst++ = *src++;
*dst++ = *src++;
}
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_ga8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = value;
*d++ = lut_linear[*src++];
}
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_ga8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = value;
*d++ = lut_linear[*src++];
}
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_g8_linear_gF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
{
u8_linear_to_float_linear (conversion, src, dst, samples);
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_g8_gamma_2_2_gF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
{
u8_gamma_2_2_to_float_linear (conversion, src, dst, samples);
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_g8_linear_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = value;
*d++ = 1.0;
}
-
- return samples;
}
-static INLINE long
+static INLINE void
conv_g8_gamma_2_2_rgbaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = value;
*d++ = 1.0;
}
-
- return samples;
}
-static INLINE long
-conv_rgbaF_linear_rgb8_linear (const Babl *conversion,unsigned char *src,
- unsigned char *dst,
+static INLINE void
+conv_rgbaF_linear_rgb8_linear (const Babl *conversion,unsigned char *src,
+ unsigned char *dst,
long samples)
{
float *fsrc = (float *) src;
v = rint (*fsrc++ * 255.0);
*dst++ = (v < 0) ? 0 : ((v > 255) ? 255 : v);
-
+
v = rint (*fsrc++ * 255.0);
*dst++ = (v < 0) ? 0 : ((v > 255) ? 255 : v);
fsrc++;
}
-
- return samples;
}
-static INLINE long
-conv_rgbaF_linear_rgba8_linear (const Babl *conversion,unsigned char *src,
- unsigned char *dst,
+static INLINE void
+conv_rgbaF_linear_rgba8_linear (const Babl *conversion,unsigned char *src,
+ unsigned char *dst,
long samples)
{
float *fsrc = (float *) src;
v = rint (*fsrc++ * 255.0);
*dst++ = (v < 0) ? 0 : ((v > 255) ? 255 : v);
-
+
v = rint (*fsrc++ * 255.0);
*dst++ = (v < 0) ? 0 : ((v > 255) ? 255 : v);
v = rint (*fsrc++ * 255.0);
*dst++ = (v < 0) ? 0 : ((v > 255) ? 255 : v);
}
-
- return samples;
}
int init (void);
/* Float versions of the double constants in rgb-constants.h */
-static long
+static void
conv_rgbaF_linear_y8_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
v = rint (value * 255.0);
*dst++ = (v < 0) ? 0 : ((v > 255) ? 255 : v);
}
-
- return samples;
}
-static long
+static void
conv_rgbaF_linear_yF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
s++;
*d++ = value;
}
-
- return samples;
}
-static long
+static void
conv_rgbaF_linear_yaF_linear (const Babl *conversion,unsigned char *src,
unsigned char *dst,
long samples)
*d++ = value;
*d++ = *s++; /* alpha */
}
-
- return samples;
}
int init (void);
#include "base/util.h"
-static long rgba_to_cmyk (const Babl *conversion,char *src,
+static void rgba_to_cmyk (const Babl *conversion,char *src,
char *dst,
long n);
-static long cmyk_to_rgba (const Babl *conversion,char *src,
+static void cmyk_to_rgba (const Babl *conversion,char *src,
char *dst,
long n);
-static long rgba_to_cmy (const Babl *conversion,char *src,
+static void rgba_to_cmy (const Babl *conversion,char *src,
char *dst,
long n);
-static long cmy_to_rgba (const Babl *conversion,char *src,
+static void cmy_to_rgba (const Babl *conversion,char *src,
char *dst,
long n);
}
-static long
+static void
rgba_to_cmyk (const Babl *conversion,char *src,
char *dst,
long n)
src += 4 * sizeof (double);
dst += 4 * sizeof (double);
}
- return n;
}
-static long
+static void
cmyk_to_rgba (const Babl *conversion,char *src,
char *dst,
long n)
src += 4 * sizeof (double);
dst += 4 * sizeof (double);
}
- return n;
}
-static long
+static void
rgba_to_cmy (const Babl *conversion,char *src,
char *dst,
long n)
src += 4 * sizeof (double);
dst += 3 * sizeof (double);
}
- return n;
}
-static long
+static void
cmy_to_rgba (const Babl *conversion,char *src,
char *dst,
long n)
src += 3 * sizeof (double);
dst += 4 * sizeof (double);
}
- return n;
}
int init (void);
-static inline long
+static inline void
float_to_u8_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
{
float *src = (float *)src_char;
return samples;
}
-static inline long
+static inline void
float_to_u8_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
{
return float_to_u8_x1 (conversion, src_char, dst, samples * 4);
}
-static inline long
+static inline void
float_to_u8_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
{
return float_to_u8_x1 (conversion, src_char, dst, samples * 3);
}
-static inline long
+static inline void
float_to_u8_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
{
return float_to_u8_x1 (conversion, src_char, dst, samples * 2);
-static inline long
+static inline void
float_pre_to_u8_pre (const Babl *conversion,unsigned char *src_char, unsigned char *dst, long samples)
{
float *src = (float *)src_char;
return samples;
}
-static inline long
+static inline void
float_to_u16_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
float *src = (float *)src_char;
}
return samples;
}
-static inline long
+static inline void
float_to_u16_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
return float_to_u16_x1 (conversion, src_char, dst_char, samples * 2);
}
-static inline long
+static inline void
float_to_u16_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
return float_to_u16_x1 (conversion, src_char, dst_char, samples * 3);
}
-static inline long
+static inline void
float_to_u16_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
return float_to_u16_x1 (conversion, src_char, dst_char, samples * 4);
}
-static inline long
+static inline void
float_pre_to_u16_pre (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
float *src = (float *)src_char;
return samples;
}
-static inline long
+static inline void
float_pre_to_u32_pre (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
float *src = (float *)src_char;
}
-static inline long
+static inline void
float_to_u32_x1 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
float *src = (float *)src_char;
}
return samples;
}
-static inline long
+static inline void
float_to_u32_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
return float_to_u32_x1 (conversion, src_char, dst_char, samples * 2);
}
-static inline long
+static inline void
float_to_u32_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
return float_to_u32_x1 (conversion, src_char, dst_char, samples * 3);
}
-static inline long
+static inline void
float_to_u32_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
return float_to_u32_x1 (conversion, src_char, dst_char, samples * 4);
}
-static inline long
+static inline void
u32_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
uint32_t *src = (uint32_t *)src_char;
return samples;
}
-static inline long
+static inline void
u32_to_float_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
u32_to_float (conversion, src_char, dst_char, samples * 4);
return samples;
}
-static inline long
+static inline void
u32_to_float_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
u32_to_float (conversion, src_char, dst_char, samples * 3);
}
-static inline long
+static inline void
u32_to_float_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
u32_to_float (conversion, src_char, dst_char, samples * 2);
}
-static inline long
+static inline void
u16_to_float (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
uint16_t *src = (uint16_t *)src_char;
return samples;
}
-static inline long
+static inline void
u16_to_float_x4 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
u16_to_float (conversion, src_char, dst_char, samples * 4);
return samples;
}
-static inline long
+static inline void
u16_to_float_x3 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
u16_to_float (conversion, src_char, dst_char, samples * 3);
}
-static inline long
+static inline void
u16_to_float_x2 (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
u16_to_float (conversion, src_char, dst_char, samples * 2);
return samples;
}
-static inline long
+static inline void
yau16_rgbaf (const Babl *conversion,unsigned char *src_char, unsigned char *dst_char, long samples)
{
uint16_t *src = (uint16_t *)src_char;
#include "babl-cpuaccel.h"
#include "extensions/util.h"
-static inline long
+static inline void
conv_yHalf_yF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
const uint64_t *s_vec;
_mm_store_ss(dst++, out_val);
n -= 1;
}
-
- return samples;
}
-static long
+static void
conv_yaHalf_yaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
- return conv_yHalf_yF (conversion, src, dst, samples * 2) / 2;
+ conv_yHalf_yF (conversion, src, dst, samples * 2);
}
-static long
+static void
conv_rgbHalf_rgbF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
- return conv_yHalf_yF (conversion, src, dst, samples * 3) / 3;
+ conv_yHalf_yF (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_rgbaHalf_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
- return conv_yHalf_yF (conversion, src, dst, samples * 4) / 4;
+ conv_yHalf_yF (conversion, src, dst, samples * 4);
}
-static inline long
+static inline void
conv_yF_yHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
const __v4sf *s_vec;
*dst++ = _mm_extract_epi16(out_val, 0);
n -= 1;
}
-
- return samples;
}
-static long
+static void
conv_yaF_yaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv_yF_yHalf (conversion, src, dst, samples * 2) / 2;
+ conv_yF_yHalf (conversion, src, dst, samples * 2);
}
-static long
+static void
conv_rgbF_rgbHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv_yF_yHalf (conversion, src, dst, samples * 3) / 3;
+ conv_yF_yHalf (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_rgbaF_rgbaHalf (const Babl *conversion,const float *src, uint16_t *dst, long samples)
{
- return conv_yF_yHalf (conversion, src, dst, samples * 4) / 4;
+ conv_yF_yHalf (conversion, src, dst, samples * 4);
}
#endif /* defined(USE_SSE4_1) && defined(USE_F16C) && defined(ARCH_X86_64) */
static const float BABL_ALPHA_THRESHOLD_FLOAT = (float)BABL_ALPHA_THRESHOLD;
-static long
+static void
conv_rgbaF_linear_rgbAF_linear (const Babl *conversion,const float *src, float *dst, long samples)
{
long i = 0;
src += 4;
dst += 4;
}
-
- return samples;
}
-static long
+static void
conv_rgbAF_linear_rgbaF_linear_shuffle (const Babl *conversion,const float *src, float *dst, long samples)
{
long i = 0;
src += 4;
dst += 4;
}
-
- return samples;
}
-static long
+static void
conv_rgbAF_linear_rgbaF_linear_spin (const Babl *conversion,const float *src, float *dst, long samples)
{
long i = 0;
src += 4;
dst += 4;
}
-
- return samples;
}
#define splat4f(x) ((__v4sf){x,x,x,x})
}
#define GAMMA_RGBA(func, munge) \
-static inline long \
+static inline void \
func (const Babl *conversion,const float *src, float *dst, long samples)\
{\
int i = samples;\
dst[3] = a;\
}\
}\
- return samples;\
}
GAMMA_RGBA(conv_rgbaF_linear_rgbaF_gamma, linear_to_gamma_2_2_sse2)
GAMMA_RGBA(conv_rgbaF_gamma_rgbaF_linear, gamma_2_2_to_linear_sse2)
-static long conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
+static void conv_rgbaF_linear_rgbAF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
{
float *tmp = alloca (sizeof(float)*4*samples);
conv_rgbaF_linear_rgbaF_gamma (conversion, src, tmp, samples);
conv_rgbaF_linear_rgbAF_linear (conversion, tmp, dst, samples);
- return samples;
}
#define YA_APPLY(load, store, convert) \
store ((float *)d++, yaya1); \
}\
-static long
+static void
conv_yaF_linear_yaF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
{
- long total = samples;
-
const __v4sf *s = (const __v4sf*)src;
__v4sf *d = (__v4sf*)dst;
*dst++ = babl_linear_to_gamma_2_2 (*src++);
*dst++ = *src++;
}
-
- return total;
}
-static long
+static void
conv_yaF_gamma_yaF_linear (const Babl *conversion,const float *src, float *dst, long samples)
{
- long total = samples;
-
const __v4sf *s = (const __v4sf*)src;
__v4sf *d = (__v4sf*)dst;
*dst++ = babl_gamma_2_2_to_linear (*src++);
*dst++ = *src++;
}
-
- return total;
}
-static inline long
+static inline void
conv_yF_linear_yF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
{
- long total = samples;
-
const __v4sf *s = (const __v4sf*)src;
__v4sf *d = (__v4sf*)dst;
{
*dst++ = babl_linear_to_gamma_2_2 (*src++);
}
-
- return total;
}
-static inline long
+static inline void
conv_yF_gamma_yF_linear (const Babl *conversion,const float *src, float *dst, long samples)
{
- long total = samples;
-
const __v4sf *s = (const __v4sf*)src;
__v4sf *d = (__v4sf*)dst;
{
*dst++ = babl_gamma_2_2_to_linear (*src++);
}
-
- return total;
}
-static long
+static void
conv_rgbF_linear_rgbF_gamma (const Babl *conversion,const float *src, float *dst, long samples)
{
- return conv_yF_linear_yF_gamma (conversion, src, dst, samples * 3) / 3;
+ conv_yF_linear_yF_gamma (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_rgbF_gamma_rgbF_linear (const Babl *conversion,const float *src, float *dst, long samples)
{
- return conv_yF_gamma_yF_linear (conversion, src, dst, samples * 3) / 3;
+ conv_yF_gamma_yF_linear (conversion, src, dst, samples * 3);
}
#endif /* defined(USE_SSE2) */
#define Q(a) { a, a, a, a }
static const __v4sf u16_float = Q (1.f / 65535);
-static long
+static void
conv_rgba16_rgbaF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
long i = 0;
for (i *= 2 * 4; i != 4 * samples; i++)
dst[i] = src[i] * (1.f / 65535);
-
- return samples;
}
-static long
+static void
conv_rgba16_rgbAF (const Babl *conversion,const uint16_t *src, float *dst, long samples)
{
long i = 0;
src += 4;
dst += 4;
}
-
- return samples;
}
#endif /* defined(USE_SSE2) */
#include "babl-cpuaccel.h"
#include "extensions/util.h"
-static inline long
+static inline void
conv_yF_y8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
{
const __v4sf *s_vec;
n -= 1;
}
-
- return samples;
}
-static long
+static void
conv_yaF_ya8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
{
- return conv_yF_y8 (conversion, src, dst, samples * 2) / 2;
+ conv_yF_y8 (conversion, src, dst, samples * 2);
}
-static long
+static void
conv_rgbF_rgb8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
{
- return conv_yF_y8 (conversion, src, dst, samples * 3) / 3;
+ conv_yF_y8 (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_rgbaF_rgba8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
{
- return conv_yF_y8 (conversion, src, dst, samples * 4) / 4;
+ conv_yF_y8 (conversion, src, dst, samples * 4);
}
-static long
+static void
conv_rgbAF_rgbA8 (const Babl *conversion,const float *src, uint8_t *dst, long samples)
{
- return conv_yF_y8 (conversion, src, dst, samples * 4) / 4;
+ conv_yF_y8 (conversion, src, dst, samples * 4);
}
#endif
#include "babl-cpuaccel.h"
#include "extensions/util.h"
-static inline long
+static inline void
conv_y8_yF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
{
const float factor = 1.0f / 255.0f;
*dst++ = (float)(*src++) * factor;
n -= 1;
}
-
- return samples;
}
-static long
+static void
conv_ya8_yaF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
{
- return conv_y8_yF (conversion, src, dst, samples * 2) / 2;
+ conv_y8_yF (conversion, src, dst, samples * 2);
}
-static long
+static void
conv_rgb8_rgbF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
{
- return conv_y8_yF (conversion, src, dst, samples * 3) / 3;
+ conv_y8_yF (conversion, src, dst, samples * 3);
}
-static long
+static void
conv_rgba8_rgbaF (const Babl *conversion,const uint8_t *src, float *dst, long samples)
{
- return conv_y8_yF (conversion, src, dst, samples * 4) / 4;
+ conv_y8_yF (conversion, src, dst, samples * 4);
}
#endif
return result;
}
-static long
+static void
conv_rgbafloat_linear_cairo24_le (const Babl *conversion,unsigned char *src_char,
unsigned char *dst,
long samples)
src += 4;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_rgbfloat_linear_cairo24_le (const Babl *conversion,unsigned char *src_char,
unsigned char *dst,
long samples)
src += 3;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_rgbafloat_linear_rgbu8_gamma (const Babl *conversion,unsigned char *src_char,
unsigned char *dst,
long samples)
src += 4;
dst += 3;
}
- return samples;
}
-static long
+static void
conv_rgbafloat_linear_rgbau8_gamma (const Babl *conversion,unsigned char *src_char,
unsigned char *dst,
long samples)
src += 4;
dst += 4;
}
- return samples;
}
-static long
+static void
conv_rgbfloat_linear_rgbu8_gamma (const Babl *conversion,unsigned char *src_char,
unsigned char *dst,
long samples)
src += 3;
dst += 3;
}
- return samples;
}
-static long
+static void
conv_yfloat_linear_yu8_gamma (const Babl *conversion,unsigned char *src_char,
unsigned char *dst,
long samples)
{
*dst++ = conv_float_u8_two_table_map (*src++);
}
- return samples;
}
-static long
+static void
conv_yafloat_linear_yau8_gamma (const Babl *conversion,unsigned char *src_char,
unsigned char *dst,
long samples)
alpha = rint (*src++ * 255.0);
*dst++ = (alpha < 0) ? 0 : ((alpha > 255) ? 255 : alpha);
}
- return samples;
}
int init (void);
}
-static long
+static void
rgba_to_ycbcra709 (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 4;
}
- return n;
}
-static long
+static void
rgba_to_ycbcr709 (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 3;
}
- return n;
}
-static long
+static void
ycbcra709_to_rgba (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 4;
dst += sizeof (double) * 4;
}
- return n;
}
-static long
+static void
ycbcr709_to_rgba (const Babl *conversion,char *src,
char *dst,
long n)
src += sizeof (double) * 3;
dst += sizeof (double) * 4;
}
- return n;
}
projects / babl.git / commitdiff